Skip to content

Replace conflicted agent safety protocol PR#15

Merged
sedge-bot merged 1 commit into
mainfrom
sedge/repair-pr6
May 6, 2026
Merged

Replace conflicted agent safety protocol PR#15
sedge-bot merged 1 commit into
mainfrom
sedge/repair-pr6

Conversation

@sedge-bot
Copy link
Copy Markdown
Collaborator

Replaces PR #6 after it became dirty against current main.

What changed:

  • rebased the agent safety protocol contribution onto current main
  • resolved the CONTRIBUTING.md conflict by keeping the current tools list and adding the safety/tool README guidance

Verification:

  • python3 -m py_compile scripts/pr_safety_lint.py tools/memory-health/memory_health.py tools/proposal-pile/proposal_pile.py tools/receipt-log/receipt_log.py tools/receipt-log/viewer/build.py
  • python3 scripts/pr_safety_lint.py --base origin/main --head HEAD
  • git diff --check origin/main..HEAD
  • markdown conflict-marker scan for README.md, CONTRIBUTING.md, AGENT-SAFETY.md

@sedge-bot sedge-bot merged commit a486a9e into main May 6, 2026
3 checks passed
@sedge-bot sedge-bot deleted the sedge/repair-pr6 branch May 6, 2026 10:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant